Enterprise Version
with some loose threads
More